(smerge-refined-change): Add :group.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce08638a6beeb0c2482cbfa721a5490f2d414429..67faa758ca358f8fdb0b1fc952f2bb5a767c66dc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-26  Juanma Barranquero  <lekktu@gmail.com>
+
+       * smerge-mode.el (smerge-refined-change): Add :group.
+
 2005-08-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * smerge-mode.el (smerge-remove-props): Make the args non-optional.

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 71fb650da7d2363ce555e160179a8f6587cf8892..4b677edc36a8db497bdd51a48b20dcb722b50733 100644 (file)
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -131,7 +131,8 @@ Used in `smerge-diff-base-mine' and related functions."
 
 (defface smerge-refined-change
   '((t :background "yellow"))
-  "Face used for char-based changes shown by `smerge-refine'.")
+  "Face used for char-based changes shown by `smerge-refine'."
+  :group 'smerge)
 
 (easy-mmode-defmap smerge-basic-map
   `(("n" . smerge-next)